Use GDK_DISPLAY_XDISPLAY instead of GDK_SCREEN_XDISPLAY since we pass in a

2002-04-27  Anders Carlsson  <andersca@gnu.org>

	* gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display):
	Use GDK_DISPLAY_XDISPLAY instead of GDK_SCREEN_XDISPLAY since
	we pass in a GdkDisplay * in the macro.

2002-04-26  Anders Carlsson  <andersca@gnu.org>

	* gdk/gdkdisplay.c: (gdk_set_default_display):
	Call _gdk_windowing_set_default_display.

	* gdk/gdkinternals.h:
	* gdk/x11/gdkmain-x11.c: (_gdk_windowing_set_default_display):
	New function that sets gdk_display to the default display.
	Fixes #79965

diff --git a/ChangeLog b/ChangeLog
index 5c01883f9931d8fc8d0430146723622a46cfbbc9..406bea472f0fd4a353d15750b5bfc0abd84861fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2002-04-27  Anders Carlsson  <andersca@gnu.org>
+
+       * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): 
+       Use GDK_DISPLAY_XDISPLAY instead of GDK_SCREEN_XDISPLAY since
+       we pass in a GdkDisplay * in the macro.
+
+2002-04-26  Anders Carlsson  <andersca@gnu.org>
+
+       * gdk/gdkdisplay.c: (gdk_set_default_display):
+       Call _gdk_windowing_set_default_display.
+       
+       * gdk/gdkinternals.h:
+       * gdk/x11/gdkmain-x11.c: (_gdk_windowing_set_default_display):
+       New function that sets gdk_display to the default display.
+       Fixes #79965
+       
 Fri Apr 26 21:58:16 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): if the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5c01883f9931d8fc8d0430146723622a46cfbbc9..406bea472f0fd4a353d15750b5bfc0abd84861fa 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,19 @@
+2002-04-27  Anders Carlsson  <andersca@gnu.org>
+
+       * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): 
+       Use GDK_DISPLAY_XDISPLAY instead of GDK_SCREEN_XDISPLAY since
+       we pass in a GdkDisplay * in the macro.
+
+2002-04-26  Anders Carlsson  <andersca@gnu.org>
+
+       * gdk/gdkdisplay.c: (gdk_set_default_display):
+       Call _gdk_windowing_set_default_display.
+       
+       * gdk/gdkinternals.h:
+       * gdk/x11/gdkmain-x11.c: (_gdk_windowing_set_default_display):
+       New function that sets gdk_display to the default display.
+       Fixes #79965
+       
 Fri Apr 26 21:58:16 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): if the

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5c01883f9931d8fc8d0430146723622a46cfbbc9..406bea472f0fd4a353d15750b5bfc0abd84861fa 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,19 @@
+2002-04-27  Anders Carlsson  <andersca@gnu.org>
+
+       * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): 
+       Use GDK_DISPLAY_XDISPLAY instead of GDK_SCREEN_XDISPLAY since
+       we pass in a GdkDisplay * in the macro.
+
+2002-04-26  Anders Carlsson  <andersca@gnu.org>
+
+       * gdk/gdkdisplay.c: (gdk_set_default_display):
+       Call _gdk_windowing_set_default_display.
+       
+       * gdk/gdkinternals.h:
+       * gdk/x11/gdkmain-x11.c: (_gdk_windowing_set_default_display):
+       New function that sets gdk_display to the default display.
+       Fixes #79965
+       
 Fri Apr 26 21:58:16 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): if the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5c01883f9931d8fc8d0430146723622a46cfbbc9..406bea472f0fd4a353d15750b5bfc0abd84861fa 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,19 @@
+2002-04-27  Anders Carlsson  <andersca@gnu.org>
+
+       * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): 
+       Use GDK_DISPLAY_XDISPLAY instead of GDK_SCREEN_XDISPLAY since
+       we pass in a GdkDisplay * in the macro.
+
+2002-04-26  Anders Carlsson  <andersca@gnu.org>
+
+       * gdk/gdkdisplay.c: (gdk_set_default_display):
+       Call _gdk_windowing_set_default_display.
+       
+       * gdk/gdkinternals.h:
+       * gdk/x11/gdkmain-x11.c: (_gdk_windowing_set_default_display):
+       New function that sets gdk_display to the default display.
+       Fixes #79965
+       
 Fri Apr 26 21:58:16 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): if the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5c01883f9931d8fc8d0430146723622a46cfbbc9..406bea472f0fd4a353d15750b5bfc0abd84861fa 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,19 @@
+2002-04-27  Anders Carlsson  <andersca@gnu.org>
+
+       * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): 
+       Use GDK_DISPLAY_XDISPLAY instead of GDK_SCREEN_XDISPLAY since
+       we pass in a GdkDisplay * in the macro.
+
+2002-04-26  Anders Carlsson  <andersca@gnu.org>
+
+       * gdk/gdkdisplay.c: (gdk_set_default_display):
+       Call _gdk_windowing_set_default_display.
+       
+       * gdk/gdkinternals.h:
+       * gdk/x11/gdkmain-x11.c: (_gdk_windowing_set_default_display):
+       New function that sets gdk_display to the default display.
+       Fixes #79965
+       
 Fri Apr 26 21:58:16 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): if the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5c01883f9931d8fc8d0430146723622a46cfbbc9..406bea472f0fd4a353d15750b5bfc0abd84861fa 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,19 @@
+2002-04-27  Anders Carlsson  <andersca@gnu.org>
+
+       * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): 
+       Use GDK_DISPLAY_XDISPLAY instead of GDK_SCREEN_XDISPLAY since
+       we pass in a GdkDisplay * in the macro.
+
+2002-04-26  Anders Carlsson  <andersca@gnu.org>
+
+       * gdk/gdkdisplay.c: (gdk_set_default_display):
+       Call _gdk_windowing_set_default_display.
+       
+       * gdk/gdkinternals.h:
+       * gdk/x11/gdkmain-x11.c: (_gdk_windowing_set_default_display):
+       New function that sets gdk_display to the default display.
+       Fixes #79965
+       
 Fri Apr 26 21:58:16 2002  Kristian Rietveld  <kris@gtk.org>
 
        * gtk/gtktreemodel.c (gtk_tree_row_ref_deleted_callback): if the

diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index 6e62364abcaf0be489ce86e1daac80a0e3404eb6..6a9e9646e4299c73ad69322cf8e891b6339ae828 100644 (file)
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -181,6 +181,8 @@ void
 gdk_set_default_display (GdkDisplay *display)
 {
   default_display = display;
+
+  _gdk_windowing_set_default_display (display);
 }
 
 /**

diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index a97b291b15191901cf5c64139f666a5ed984b5d1..a582b5169111c5dbeddd9ac382604cf7d6e1a87a 100644 (file)
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -231,6 +231,7 @@ void _gdk_cursor_destroy (GdkCursor *cursor);
 
 extern GdkArgDesc _gdk_windowing_args[];
 void         _gdk_windowing_init                   (void);
+void         _gdk_windowing_set_default_display    (GdkDisplay *display);
 
 void     _gdk_windowing_window_get_offsets      (GdkWindow  *window,
                                                 gint       *x_offset,

diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 43a66b73476fc61aa7b2726cb6cf27b36de44c25..aeee70a001008153f8ec2736951df1cf2539c2af 100644 (file)
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -106,6 +106,12 @@ _gdk_windowing_init (void)
   _gdk_selection_property = gdk_atom_intern ("GDK_SELECTION", FALSE);
 }
 
+void
+_gdk_windowing_set_default_display (GdkDisplay *display)
+{
+  gdk_display = GDK_DISPLAY_XDISPLAY (display);
+}
+
 void
 gdk_set_use_xshm (gboolean use_xshm)
 {

diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c
index 450347c4a092efec92f263729e016b7b62a27157..775dc4db7b2275293bd0093611e7d29c49c55273 100644 (file)
--- a/gdk/x11/gdkpixmap-x11.c
+++ b/gdk/x11/gdkpixmap-x11.c
@@ -346,7 +346,7 @@ gdk_pixmap_foreign_new_for_display (GdkDisplay      *display,
 
   /* get information about the Pixmap to fill in the structure for
      the gdk window */
-  if (!XGetGeometry (GDK_SCREEN_XDISPLAY (display),
+  if (!XGetGeometry (GDK_DISPLAY_XDISPLAY (display),
                     xpixmap, &root_return,
                     &x_ret, &y_ret, &w_ret, &h_ret, &bw_ret, &depth_ret))
     return NULL;